Merge 0.13 to 0.13-2.11

Review by @harrah

/cc @cunei