pl injection on 20140526-142752
Merge commit 'a9bcfbfb81b00d1bb766b64bc7fd0f474a241328' into HEAD