Deleted extra stuff.
Merge branch 'release/v0.11'