RainbowDashDC/aeslua — pull request #1 by RainbowDashDC (2014-12-04 05:38:45+00:00)
Title: Merge

Sync w/ upstream