8345: Merge branch 'master' into 8345-llfuse-unpin
authorTom Clegg <tom@curoverse.com>
Mon, 7 Mar 2016 05:47:10 +0000 (00:47 -0500)
committerTom Clegg <tom@curoverse.com>
Mon, 7 Mar 2016 05:47:10 +0000 (00:47 -0500)

Trivial merge