automated commit
Merge branch 'master' of github.com:jimmytidey/asset_mapping
automated commit