Add a test for tuples with non-primitive subtypes
Merge branch 'master' into 159-merge

Conflicts:
	tests/integration/standard/test_types.py