Faeriol/brog — pull request #1 by Faeriol (2014-03-24 17:17:22+00:00)
Title: Remerge with upstream

Just tracking master