Hopefully this will work this time.
Merge remote-tracking branch 'origin'

Conflicts:
	hack-mmap.py
work more on hack-mmap script