Fixed issue #113
Merge branch 'milestone-1.1.2' into bench-query