SonicPotions/LXR — pull request #1 by SonicPotions (2013-12-06 11:34:54+00:00)
Title: Merge master with rudeog fork

First time I try merging... let's hope it works out.