rebase to 1.2.11 from Fedora 21 Rawhide