Merge pull request #710 from raphinesse/q-nomore