Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Wed, 13 Jul 2016 16:43:28 +0000 (18:43 +0200)
committerKim Alvefur <zash@zash.se>
Wed, 13 Jul 2016 16:43:28 +0000 (18:43 +0200)
commita6168c7337cc83c1c60f3e3f7b80f0bf9d7429d4
treee21272cd7d1bab62f199f0108ad36ef2e93438f2
parent77921187498c8eba6ca32f9b3d3a71ace5909e24
parent8551bf5a2ae3d1c8bc47f052f531902fe4f0d919
Merge 0.9->0.10