Merge branch 'master' into 4823-python-sdk-writable-collection-api
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 5 Feb 2015 21:17:35 +0000 (16:17 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 5 Feb 2015 21:17:35 +0000 (16:17 -0500)

Trivial merge