Merge branch/2014-01-15/nailboard into the master sources.