Update from mobilesiteos master for osm_msos