Part 2 of Thin Ice fixes. Bump Nightly version to 20140406.