Merge branch 'chris-martin-directory-status-space'

Signed-off-by: Eric F Crist <ecrist@secure-computing.net>
This commit is contained in:
Eric F Crist 2017-09-12 08:58:11 -05:00
commit c75e74a697