Added missing Data. object prefix for cancel button
Merge remote-tracking branch 'origin/master' into gh-pages