Fixed a segmentation-fault bug experienced by Arch Linux users in Mega mode
Merge remote-tracking branch 'origin/master'