Added latest changes from master.