Merge remote-tracking branch 'origin/2.11.x' into macro-paradise

Author: SethTisue

common.conf

@@ -74,7 +74,8 @@ vars: {
   zeromq-scala-binding-ref     : "valotrading/zeromq-scala-binding.git#062e9438e322ec29d75b9649cb2aafa6ba3198a6"
   // fixed sha/tag (a compromise), the sha points at master that supports Scala 2.11
   spire-ref                    : "non/spire.git#3d2a41e91a1f6946fac63660f6157d4a6e4a281d"
-  shapeless-ref                : "milessabin/shapeless.git"
+  // https://github.com/scala/community-builds/issues/202
+  shapeless-ref                : "milessabin/shapeless.git#d6a4f56e0783655c48244ec23c4f4c2d98401a72"
   scoverage-ref                : "scoverage/scalac-scoverage-plugin.git#1.0.2"
   // change from https://github.com/sbt/sbt/pull/1509 broke building sbt with Scala 2.11
   // this problem is tracked in https://github.com/sbt/sbt/issues/1523