* commit 'fddd927fb78bb206287203f4f447a416b525115a': DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.
* commit 'fddd927fb78bb206287203f4f447a416b525115a': DO NOT MERGE: From master -- Fix bug in deciding which rotation to use for an orientation.