Build after merging latest modifications from travist/jsencrypt
Merge branch 'master' into gh-pages