added file-b
milestone: 20140528052642-HOTFIX
Merge branch 'release/20140528052642-HOTFIX'