Merging with master
Fixing commit
Merge branch 'ari-mapdesign'