Merge branch 'dev' into f-select-name-from-entity

tests/test_query.py

@@ -205,7 +205,8 @@ def test_query3():
     assert xml.xpath("/Response/TransactionBenchmark")
     assert xml.xpath("/Response/Query")
     assert xml.xpath("/Response/UserInfo")
-    assert_equal(3, len(xml))
+    assert xml.xpath("/Response/noscript")
+    assert_equal(4, len(xml))
 
 
 @mark.slow