Master

Merging release branch to master. With this change master branch contains CTP2 code.