Merge branch 'develop' of github.com:schuhschuh/gflags into develop