Merge branch 'hotfix-0.6.2'
Merge branch 'master' of github.com:PredictionIO/PredictionIO into develop