Manual merge from marcoVermeulen/gradle-plugins. Close #25