Merged futon-async branch back into trunk.