restund tweaks
Update CALENDAR.md
Merge remote-tracking branch 'upstream/master'
Tweaks to scaling signaling, etc.
Merge pull request #778 from samdutton/master

Tweaks (scaling signaling, etc.)
Merge pull request #779 from html5rocks/master

Merging master to live to pick up Sam's changes.