Revision 2215cc9824dc06bd5f4753677ee14b7191a30056

Committed on 11/03/2014 8:28 am by Julius Beckmann <github@h4cc.de> [GitHub Diff]

Rebased to current master