Pre release

https://trello.com/c/dpIxUk9n

Final test commit pre release to master