Update for release 1.6.5
alias '/rc options' to '/rc config'
Merge changes from upstream