Merge remote-tracking branch 'origin/master' into translucency
Improve text of Add Data panel errors.
Tweak error text.
Merge pull request #269 from NICTA/addDataHelp

Add data help