Merge branch '2015.11-pgsql' into 2015.11