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