Make it work with gradle-1.6
Merge branch 'update'