Merge branch 'wkalinin-override_fix'

* wkalinin-override_fix:
  test case added for "override" from imported module
  #733 - wrong "override" calculation in import mode

Examples/test-suite/imports_a.h

@@ -18,4 +18,12 @@ class A {
   virtual MemberEnum member_virtual_test(MemberEnum e) { return e; }
   virtual GlobalEnum global_virtual_test(GlobalEnum e) { return global_test(e); }
 };
+
+/* This class overrides nothing. Inherited classes should see base functions.
+*/
+class A_Intermediate : public A { 
+ public:
+  A_Intermediate(){}
+  ~A_Intermediate(){}
+};
 #endif

Examples/test-suite/imports_b.h

@@ -1,6 +1,6 @@
 #include "imports_a.h"
 
-class B : public A 
+class B : public A_Intermediate
 { 
  public: 
   B() {};