Fix Dimension Crash

Last thing with the bfox's merge.
Merge remote-tracking branch 'origin/master' into bfox