0.7.2
Merge remote-tracking branch 'upstream/master' into refactor/minor-updates-and-fixes