Merge branch 'hotfix-2.0.1'
Merge branch 'hotfix-2.0.2'
Upgrade to Ruby 2.1.2
Merge branch 'master' into develop