Merge branch 'master' into 3198-writable-fuse
authorPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 18 May 2015 20:50:36 +0000 (16:50 -0400)
committerPeter Amstutz <peter.amstutz@curoverse.com>
Mon, 18 May 2015 20:50:36 +0000 (16:50 -0400)

Trivial merge