Merge remote-tracking branch 'mdroth/qga-pull-1-8-2013' into staging