ca injection on 20140920-005007
Merge commit 'bbc07ba5f8276e388284da85762f31f39d7cf7b5' into HEAD