More 1.5.2 backports, Illumination, etc...

Includes commits f3f210a260c24aa13bf757c4d09af1650545f11b,
7909fd1852cc013045c23ce69eae7e9b7fc917e0.
92ffae6d59f87e11abc804728b51bd1fc946d2bc,
451caf2183480e84323905a7861e94d1f2b47545,
587d88638e674d2a8994056df58d3a8943a02e9e,
c329226c76d24b7ad7b5ec4da6ba47335a5ce5ca,
bb1cdc4aa7ccc51f099d4c6f04aff765f745aa74,
340524c45e98f9a5ecad256d6a83973fa54dc98d,