Intermediate changes.
Merge branch 'master' of github.com:shepting/AutoLayout