MAVEN-121

Looks like brianchandotcom:master is a little behind the commits made by the CI server to the upstream. The changes for MAVEN-121 are in the last commit, with only 4 changed files.