* Addressed things flagged by appdata-validate.
Merge remote-tracking branch 'jsb/appdata' into appdata