Pull master changes to tmx-support