Resolving conflicts from cabrera-py33_fixes.
Merge branch 'cabrera-py33_fixes'