Added -Wsign-conversion back
Merge branches 'dev' and 'master'