0.8.11-rc2

Merge Development History into Master