Bug 1029576 - sync gaia/shared with app/shared
Merge pull request #47 from pivanov/bug-1029576

Bug 1029576 - sync gaia/shared with app/shared