fr injection on 20140703-005131
sq injection on 20140703-005131
Merge commit 'acfbcbe644d64fd2c52ef579eddc89750be18242' into HEAD