Merge branches 'jone-customstyles-adapter' and 'jone-meta-viewlet' into jone-boe

Conflicts:
	docs/HISTORY.txt