Dummy commit to workaround bug in release script.

If one commit in this repo is tagged with two different tags,
the scala-dist-2.11.x jobs on Jenkins can pick the wrong
version of scala-dist to build the release!
Merge branch 'master' of github.com:scala/scala-dist