fa injection on 20140731-005205
Merge commit '2f7eaf2cf77a825bf308978c702a95c153a4331c' into HEAD