version: 20131128
worch: sync with upstream (7e9f0bd)