By: DerFrZocker <derrieple@gmail.com>
See preceding commit for why this change was included. By: Xor Boole <mcyoung@mit.edu>