Merge branch 'master' into nikitakit_ducks