Merge our fixes branch to bring in commits that are prerequisities for further development or would cause conflicts.
