Merge branch 'master' into 1977-provenance-report
authorPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 29 Jan 2014 19:41:55 +0000 (14:41 -0500)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Wed, 29 Jan 2014 19:41:55 +0000 (14:41 -0500)

Trivial merge