Merge 0.9->0.10
authorKim Alvefur <zash@zash.se>
Fri, 24 Jun 2016 13:11:06 +0000 (15:11 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 24 Jun 2016 13:11:06 +0000 (15:11 +0200)
commitedc4a8042744ed9d49c079f11a10acfce126a6df
tree9509f598c2f593ef1d86e898eff82f55afbec86b
parentcacc6991eb55b8bc539e69edf4d1195ce17042b6
parent65839b3496eb3cf18da153cfc8c58093d0882975
Merge 0.9->0.10