Merge branch 'hotfix/BPFD-298'
Merge branch 'develop'
ready to merge
Merge branch 'hotfix/BPFD-304' into develop
This brings in BPFD294 Merge branch 'develop' into release/release-1-22-2014_1_5_3