Pre release

https://trello.com/c/dpIxUk9n

And a pull request from Pre release to master - more detail :)