minor
Merge remote-tracking branch 'origin/master'
force 1.6 for compiled classes version
plugin version ++