Merge branch '2015.11-sambaad' into 2015.11