5198: Merge branch 'master' into 5198-remote-link-ctrl-click
authorTom Clegg <tom@curoverse.com>
Mon, 23 Mar 2015 05:52:50 +0000 (01:52 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 23 Mar 2015 05:52:50 +0000 (01:52 -0400)

Trivial merge