Merge branch 'refs/heads/bugfix/#77-@GFLAGS_IS_A_DLL@-expands-to-empty' into develop