Merge branch 'terencehill/server_aliases_fix' into 'master'
authorTimePath <andrew.hardaker1995@gmail.com>
Tue, 29 Dec 2015 02:41:23 +0000 (02:41 +0000)
committerTimePath <andrew.hardaker1995@gmail.com>
Tue, 29 Dec 2015 02:41:23 +0000 (02:41 +0000)
Server aliases fix

See merge request !271


Trivial merge