Merge branch '4836-first-tab-load-wip'
authorBrett Smith <brett@curoverse.com>
Tue, 6 Jan 2015 17:12:27 +0000 (12:12 -0500)
committerBrett Smith <brett@curoverse.com>
Tue, 6 Jan 2015 17:12:36 +0000 (12:12 -0500)
Closes #4836, #4870.


Trivial merge