Commits in ~tthurman/hildon/bug154810:master