Merge branch '11209-unmount-subtype'
authorTom Clegg <tom@curoverse.com>
Fri, 7 Apr 2017 17:23:57 +0000 (13:23 -0400)
committerTom Clegg <tom@curoverse.com>
Fri, 7 Apr 2017 17:24:13 +0000 (13:24 -0400)
refs #11209


Trivial merge