Hotfix BPFD-314
Merge branch 'master' into release/release-2-7-2014_1_5_7b