el injection on 20140624-005541
Merge commit '9cd4e6c7da7413a6a2199b5640cf7d651e4731a1' into HEAD