Get developer branch up to date with master