289f90bdbe merged a commit that relied on 5b9db81819 but the latter commit was not merged. This does manual wrangling to make sure the same file that exists on develop right now ends up on master.
289f90bdbe
5b9db81819