Adding dev file of potential code for 305
Adding tox2ik's changes for the utf8 changes

These are based off of trunk on the SVN prior to commit 3074