Update Developer with Master

See above.