Merge branch '2.x-release/v2.0.4' into 2.x

Merge branch '2.x-release/v2.0.3' into 2.x

Merge pull request #65 from webreinvent/2.x-hotfix/v2.0.1

2.x hotfix -> 2.x | v2.0.1

updated: version

updated: changelog

updated: changelog

updated: changelog

updated: changelog

updated: changelog

Merge remote-tracking branch 'origin/master'