merge paulp/sbt-extras master