Check the port in addition to just the server names in isSameHost()
Work around for migration issues on non-64 bit systems
Merge remote-tracking branch 'upstream/master'

Conflicts:
	application/config/migration.php
	application/core/Plain_Controller.php
Fixed merge with origin/master
Merge pull request #1 from RichardHyde/master

updating master