2014.10.06 (1.49i8)
Merge remote-tracking branch 'upstream/master'
Allow port to be changed after instance made