Syncing from Monotone at 20160217-174802. Last commit message was Support for dumping\ local variables and functions into a fresh package.