Merging changes from Fedora and upgrading to 10.0.15