COMP: Added patch from Dirk Padfield -- http://review.source.kitware.com/#/c/9938/