Proposed merge of kanzure/master into yenatch/master

Better that this is done here and now than later.