Merge branch 'master' into el6
    
    * master:
      Fixup python macros, conditionl
      Update to 12.0.7
      add python3 subpackage
      update to virtualenv 1.11.6
      - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild