Don't merge this until 2014/11/06 19:00 JST

See lingr logs.