https://issues.jboss.org/browse/DTGOV-107
Merge pull request #384 from KurtStam/master

https://issues.jboss.org/browse/DTGOV-107