Merge pull request #329 from peppy/general-fixes

Update framework.
This commit is contained in:
Dean Herbert 2017-02-07 23:44:00 +09:00 committed by GitHub
commit a953f22de6

@ -1 +1 @@
Subproject commit c11986f18b2a6e8bf93ef9bcb0bece2936ad0381
Subproject commit 93cd883930e362f7bb8c361ac7f36b5387d4fac3