Merge remote-tracking branch 'mdroth/qga-pull-3-12-2012' into staging