Upstream version 0.2016.06.10