Build is fixed.
Revert "Revert "Merge branch 'master' of https://bitbucket.org/schnorr/compil-2014-1""

This reverts commit f348ff4ed78ad5e679f47459d5836ac036ec36a9.
Merge branch 'stage_2'