fr injection on 20140916-005033
Merge commit '11a2c876b6b63a932d87aa50ff229ec12d1a7905' into HEAD