Merge Vogel612:vogel612 -> Vincentyification:vogel612_