[MERGE] merge donkirkby's patch to re-enable purchase module smoke test