Merged 3.07b

I have merged 3.07b for you.

No changes on my side.