fix-bugs-20140816-X1