3170: Merge branch 'master' into 3170-refresh-tab-pane
authorTom Clegg <tom@curoverse.com>
Mon, 21 Jul 2014 17:00:42 +0000 (13:00 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 21 Jul 2014 17:00:42 +0000 (13:00 -0400)

Trivial merge