fix-bugs-20140905-X1