Seems like some changes were lost when I manually resolved the conflicts related to branch 905-...
Merge pull request #1006 from SalesforceFoundation/feature/fixing-dev-20140903

Seems like some changes were lost when I manually resolved the conflicts...
Merge dev into feature/983-data-importer