Merge branch 'master' into 4823-python-sdk-writable-collection-api
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 19 Feb 2015 14:32:57 +0000 (09:32 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 19 Feb 2015 14:32:57 +0000 (09:32 -0500)

Trivial merge