scala 2.11.4.
Merge commit 'refs/pull/89/head'