Squashed merge of many commits, including (but not limited to) :