Merge branch/2014-05-28/align into the master sources.
Fix typo.