Merge branch '2015.11-php7' into 2015.11