Handle module __builtins__ both as dict or module (#1107)

Handle module __builtins__ both as dict or module (#1107) #240