upstream/1.0.1+git20170126
fd0ee009 · Some minor fixes ·