BZ-12960 Fix for markup
Merge branch 'RC20140807' into integration