Merged some bug fixes from lib to lib3.
1 file changed