Merge branch 'rel/1.0.0' into restoreLoc

This commit is contained in:
Piotr Puszkiewicz 2016-12-07 00:51:53 -08:00 committed by GitHub
commit 15e86d8c58