Merged in latest code changes from master.