prepare release

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
Merge remote-tracking branch 'upstream/master'