Merge all changes from people/chrsmrtn. interbase is back, style splitout reverted, etc. 3.3.4 vs. 3.3.5 still to be decided.
Changed paths: