Yahttp sync 20140710

Fixes #1527, fixes #1489 and supersedes #1530 and #1528