worch: sync w/ upstream (e5879bd)
version: 20130930