upstream/20130829+git20130829

Devon Kearns

@dookali

142ed3f5 · Imported Upstream version 20130829+git20130829 · Aug 29, 2013

Upstream version 20130829+git20130829