Merge tag '20140528052642-HOTFIX' into hotfix/trial

milestone: 20140528052642-HOTFIX 20140528052642-HOTFIX