Editing encoding preferences topic
Commit to illustrate issue #35
Commit to reverse changes related to issue #35 that broke build
Merge branch 'dev'

* dev:
  Commit to reverse changes related to issue #35 that broke build
  Commit to illustrate issue #35
  Editing encoding preferences topic