A temporary commit that doesn't even compile
Merge branch 'master' into external_mapviewer