Merge branch 'master' of git://github.com/JeffTolbert/612-2013

Conflicts:
	ports.cpp
Merge branch 'master' of https://github.com/anidev/612-2013

Conflicts:
	ports.cpp