Most of this was fixed by the linked tickets, before I knew something similar was accomplished in the 3.6 branch (and not master). Merging in additional work on 3.6 that would be useful.
This message is automatically generated by JIRA.
If you think it was sent incorrectly, please contact your JIRA administrators
For more information on JIRA, see: http://www.atlassian.com/software/jira
Most of this was fixed by the linked tickets, before I knew something similar was accomplished in the 3.6 branch (and not master). Merging in additional work on 3.6 that would be useful.