fix to orientation woes caused by bug fixes from apple in ios8
Merge remote-tracking branch 'origin/master'