Pulled in latest revisions from bazaar