Fix a tuple attribute bug that was causing model-generation problems for tuples
Merge branch '1.0.x'