Merge branch/2014-03-25/ansi into the master sources.
steptest uses incremental collection, so can't be run under CONFIG_POLL_NONE.