escape $
Merge branch '20140722'