Pre release

https://trello.com/c/dpIxUk9n

Commit from pre-release to master