Merge branch 'bug_183_remove_invert_display'