Merge upstream version 1.2.8-7 (Ubuntu 14.04)