Fix array type problems (issue 211), except for scalar broadcasting
Update tests for array type issues
Merge branch 'issue_211' into 2.1