steal everything from 080 except for the context junk.#187

Marchowes wants to merge 1 commit intomasterMarchowes/pyProm:masterfrom

080-cherry-picked-from-080Marchowes/pyProm:080-cherry-picked-from-080Copy head branch name to clipboard