Merge branch 'master' into bishop_pin_clop