updated to use upcoming ver
Merge branch 'master' of github.com:mkhan3189/project-islam

Conflicts:
	core/extension/extension_base.h