GLab/ToMaTo — pull request #341 by t-gerhard (2014-01-06 12:19:17+00:00)
Title: Account flags

Closes #278
Accidentally contains commits from #338