MAIN-30 SA-CORE-2014-005-D7.patch
Merge branch 'MAIN-30'
SA-CORE-2014-005-D7.patch