Merge pull request #482 from dduponchel/release_3.1.5

Release 3.1.5