Merge 0.13 to 0.13-2.11

And then bump to Scala 2.11.0-M7

Review by @harrah

/cc @cunei