(Issue 326) Fixed follow-ups review items for #284
Merge branch 'master' into issue-326

Conflicts:
	node_modules/oae-search/lib/util.js