Merge branch 'peterlauri-master' into staging