Merge pull request #321 from peppy/general-fixes

Update framework.
This commit is contained in:
Dean Herbert 2017-02-06 18:44:55 +09:00 committed by GitHub
commit 8da9ef6911

@ -1 +1 @@
Subproject commit f4362fce5a891e8b8dd84fadc0a9743a8c92e030
Subproject commit 6c9be31f1928436d92b8880c16bb9ffe3b550991