Catch up merge from masters to branch/2014-01-15/nailboard.