rutie

1005d518 - Merge branch 'master' into encoding_support