config: Update 2014-09-17.

mt: mergetool

Signed-off-by: Yeqiao Wang <ee07b291@gmail.com>