Crashplan conversion#472

orrison-andrew wants to merge 2 commits intocode42:maincode42/py42:mainfrom

CrashPlan-Labs:crashplan-conversionCrashPlan-Labs/pycpg:crashplan-conversionCopy head branch name to clipboard