Merge branch 'master' into compression_experiment

This merge contains update to the newest version of source repository
(the one from which the fork was created) and multiple fixes to build
the project.