Merge remote-tracking branch 'mdroth/qga-pull-4-2-13' into staging