3.3/develop

Left the two commits to retain my submodule repo history, hopefully that's not an issue to accept the pull request. ;)

Cheers,
~ Dani