SA-CORE-2014-005-D7
Merge pull request #3 from odsherred/h/SA-CORE-2014-005-D7

SA-CORE-2014-005-D7