Total, huge and fatty merge of work done on master since 20140619.