SOF integreation
Merge branch 'SimpleOptions' of https://github.com/aristath/shoestrap into SimpleOptions

# By Aristeides Stathopoulos
# Via Aristeides Stathopoulos
* 'SimpleOptions' of https://github.com/aristath/shoestrap:
  languages

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.