Flyas now rotate themselves back upright when rotated
Merge remote-tracking branch 'origin/master'