Merged changes from main trunk up to version_2_1_4