Merge branch 'dev' into config-changes
Dirty work-around to get IPAddress TypeConverter usage in Mono for command line options.
Merge branch 'config-changes' into dev