Resolved conflict during merge.
straighten/straighten_headings fix for masked rollovers.