[rpkg/el6] (2 commits) ...Merge branch 'master' into el6

[Jesse Keating]

Summary of changes:

  fa5faff... moar bugfixing (*)
  1658dfe... Merge branch 'master' into el6

(*) This commit already existed in another branch; no separate mail sent