Some merge cleanup.
AutoLayout
2013-12-31, Frank Dowsett