Fucktorations and beautifications.
Merge remote-tracking branch 'origin/0.11' into 0.11