rackerlabs/otter — pull request #584 by MariaAbrahms (2014-03-20 00:22:55+00:00)
Title: re-did changes for AUTO-824 bug

this pull request is to re-do a few changes for AUTO-824 bug