Using stable PropEr version for tests
Merge branch 'master' into r14