This is ready to put into the release
Merge branch 'hotfix/bpfd-314'
Merge branch 'hotfix/bpfd-314' into develop
...
Merge branch 'release/release-1-30-2014_1_5_6'