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