Release Simon from the correct branch

Authored by fux on May 16 2017, 9:26 PM.