Merge AutoLayout fixes for 10.7+ and some extra features