merge from version-2
Merge branch 'master' of https://github.com/klahnakoski/Bugzilla-ETL