-Merge branch 'master' into gsoc2018/rest_api