Merge branch 'master' into 4823-python-sdk-writable-collection-api
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 5 Jan 2015 15:28:40 +0000 (10:28 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 5 Jan 2015 15:28:40 +0000 (10:28 -0500)

Trivial merge