Merge remote-tracking branch 'remotes/mdroth/tags/qga-pull-2015-07-21-tag' into staging