el injection on 20140614-005130
Merge commit 'd5e2765ff5d0aa809645db08a5048a95c3acfe4d' into HEAD