ding2/alma — pull request #1 by cableman (2012-08-28 09:12:36+00:00)
Title: Fixes from DBC to alma

Different fixes cherry-pick from DBC