20140812 committed

20140812 committed