Jim's changes
Merge branch 'master' into Layout-changes