refs #30 - manually patched lp1299116/run to match version in 3.x.
Merge branch '2.x' into 3.x