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