Merge pull request #371 from peppy/general-fixes

Update framework.
This commit is contained in:
Thomas Müller 2017-02-18 16:33:09 +01:00 committed by GitHub
commit 5721e7f2d2

@ -1 +1 @@
Subproject commit 28c4acbb818d7be0ff66c600daacde9d91a99c6e
Subproject commit 697d8b7e9530ba7914d9c78012329ce1559e3681