Merge remote-tracking branch 'upstream_github/master' into loopy_to_loopyy