Commit 48ef55a6c58fd7d8b5f2fc46988be836724dee5f

kanoi 2014-06-27T00:21:53

Merge pull request #618 from kanoi/master Minion changes and S1 fix