Merged branch 'no-javascript' with notes