Rebase on 20140430 snapshot.

Signed-off-by: Oleg Girko <oleg.girko@jolla.com>