Tweaks to building outlines
Merge branch 'refs/heads/master' into test