update branches with bugfixes from HEAD