Merge branch/2014-06-11/grain into the master sources.
Some assertions with && crept back in. Split them up so that we get as much information as possible from an assertion failure.