Version 3: Major improvments#1

danielRConsid wants to merge 3 commits intomainMaplePHP/Query:mainfrom

rewrite-coreMaplePHP/Query:rewrite-coreCopy head branch name to clipboard