jtakayama/makahiki — pull request #1 by jtakayama (2013-08-26 07:26:06+00:00)
Title: Master

Merge into downstream branch.