Merge remote-tracking branch 'origin/master' into 2061-update-docs
authorPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 11 Feb 2014 19:29:14 +0000 (14:29 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Tue, 11 Feb 2014 19:29:14 +0000 (14:29 -0500)

Trivial merge