Orientation fix missing in latest stable

@zogstrip @neil do you have any plans to merge these changes back in to stable ?