Merge branch 'release/v0.1.5'
Merge branch 'release/v0.1.6'
Merge branch 'master' into hadoop-1.0.3