Hotfix/2013 09 19

Cherry picking Julian's unicode improvements on import