upstream/0.6+20160920git0c697b9
4f096fe6 · Squashed commit of the following: ·