Merge branch 'development' into release-2.9
Updating Google CSE to work with https
Merge branch 'master' into development