5414: Merge branch 'master' into 5414-keep-service-hints
authorTom Clegg <tom@curoverse.com>
Mon, 13 Apr 2015 20:24:02 +0000 (16:24 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 13 Apr 2015 20:24:02 +0000 (16:24 -0400)

Trivial merge