grdk/Questor — pull request #3 by grdk (2012-08-28 21:36:05+00:00)
Title: Merge current grdk/Questor/working back into grdk/Questor/experimental

The /working branch is tested fine up to the last commit, so merging those changes back into /experimental.