2.0.0-RC6-SNAPSHOT of jig.
Merge fixes.