Patched devel with changes from master.
Note: pls only pull changes into devel :)