Merge remote-tracking branch 'mdroth/qga-pull-1-28-13' into staging