yahoo/mojito — pull request #1123 by imalberto (2013-05-17 02:41:21+00:00)
Title: Merging #develop into #next

Bringing #next up to date with the latest #develop commits.