20140617 - Improved orientation setup implementation
Merge remote-tracking branch 'upstream/master'