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