updated with files from fedora py3.4 branch