Wrap Sandcastle console, per request in #1149.
Merge remote-tracking branch 'origin/master' into complexpolygon