Upgrade from upstream 28.10.2015

Upgrade from community upstream 28.10.2015