am 0950a3ef: Merge "Added check to make orientation calculations more robust"

* commit '0950a3ef3610184858466a4dfeb1c11c3b1ed0aa':
  Added check to make orientation calculations more robust