Fix for SI-2712 implemented as a compiler plugin for Scala 2.11.8 and 2.10.6 - View it on GitHub