Sync up with angrylion's repository.