No longer need to enforce a 255 max limit on number of structure types.
Merge branch 'bugfixes' into 3.1