Merge branch 'develop' of github.com:nicolargo/glances into develop