Merge 0.10->trunk
authorKim Alvefur <zash@zash.se>
Fri, 8 Jul 2016 20:01:10 +0000 (22:01 +0200)
committerKim Alvefur <zash@zash.se>
Fri, 8 Jul 2016 20:01:10 +0000 (22:01 +0200)

No differences found