patch1
Merge remote branch 'origin/master' into fnord
rpc => 15
Merge remote branch 'origin/master' into fnord
Add configuration option for file viewer