Partial merge of 20131121 update.