ca injection on 20140911-102156
Merge commit 'db222b77a31785f837d534c490b721a715c33c18' into HEAD