Merge branch 'master' into tidy-headers

This commit is contained in:
artemp 2016-08-03 12:36:03 +01:00
commit ce3cbdd83e

2
deps/mapbox/variant vendored

@ -1 +1 @@
Subproject commit 388376ac9f0102feba2d2122873b08e15a66a879
Subproject commit 8e2f6964157885f1655c1673d65f3aea9b90fe18