Removed undocumented panel.height, remove Math.floor from panel spans
Merge remote branch 'upstream/master'