Upmerge 2014-01-15

Upmerging to the upstream.
Ref: http://webapps.stackexchange.com/questions/28998/how-do-you-update-a-github-repo-fork-in-the-web-interface