Hammy

Another merge back to master.