Fix typo.
Merge branch/2014-01-15/nailboard into branch/2014-03-25/ansi to pick up nailboardtest Windows fix.