Set default max occurs for choice tag 1.  Using ref if name not available when storing choice options
Merge branch 'master' into gh-pages