ca injection on 20140925-005028
Merge commit '0626747906b30ddce93167d49bee97a076458900' into HEAD