Merge branch '5414-keep-service-hints' refs #5414
authorTom Clegg <tom@curoverse.com>
Mon, 13 Apr 2015 21:05:44 +0000 (17:05 -0400)
committerTom Clegg <tom@curoverse.com>
Mon, 13 Apr 2015 21:05:44 +0000 (17:05 -0400)

Trivial merge