upstream/0_20160821

Luca Bruno

@lucab

6a1daca7 · Imported Upstream version 0~20160821 · Aug 30, 2016

Upstream version 0~20160821