Merge branch 'master' into 3198-writable-fuse
authorPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 14 May 2015 19:26:40 +0000 (15:26 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Thu, 14 May 2015 19:26:40 +0000 (15:26 -0400)

Trivial merge