Set release number to 2.0.4.

Signed-off-by: Eric Leblond <eric@regit.org>
Merge branch 'master' into sprint