Merge of loc into master.