Ecotrust/solomon — pull request #336 by qpfiffer (2013-12-17 23:34:00+00:00)
Title: Feature/2013 12 17 fixes

Includes branch from yesterday.