3021: Merge branch 'master' into 3021-api-performance
authorTom Clegg <tom@curoverse.com>
Tue, 20 Jan 2015 08:04:07 +0000 (03:04 -0500)
committerTom Clegg <tom@curoverse.com>
Tue, 20 Jan 2015 08:04:07 +0000 (03:04 -0500)

Trivial merge