Merge pull request #429 from shelhamer/next

Next: 0.999