ikeough/Dynamo — pull request #911 by l2obin (2013-12-10 04:05:35+00:00)
Title: Merge master into ChocoButterUI

No merge conflict.