Merge 2014/8/1

Merge 2014/8/1.