Port changes from 1.5 to 2.0#90

homersimpsons merged 2 commits into2.0thecodingmachine/magic-query:2.0from

1.5thecodingmachine/magic-query:1.5Copy head branch name to clipboard