fixed link
Merge branch 'master' into scala_2.11

* master:
  fixed link