Merge remote-tracking branch 'mdroth/tags/qga-pull-2017-04-25-v2-tag' into staging