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