Full merge of contributors code

Full merge of all contributors code.