ca injection on 20141018-005108
Merge commit 'f57ad3b784cad59e18c7a8bfe9ffe6d980c9c602' into HEAD