el injection on 20141002-005032
merge master into skin-module