Urgent fix for dygraphs
Merge remote branch 'upstream/master'
Updates based on feedback