Pulled updates from lib/Trieng.