merge patched-ubuntu/utopic into ubuntu/utopic
Revert changelog to uploaded version

Signed-off-by: Louis Bouchard <louis.bouchard@canonical.com>