Merge branch 'travis' into develop
Update makefile
Merge branch 'fix-leak-with-gdkpixbuf-loader' into develop
Merge branch 'build' into develop
Merge branch 'develop' into build