Merged in latest changes from sall/Master.