Next

Full merge of next into master. We are getting closer to a RC1!