Merge devel to master, we are going to do some backwards incompatible changes