Merge branch 'hotfix/bpfd-314'
Merge branch 'release/release-1-30-2014_1_5_6'
Hotfix for BPFD-314 use of -i for commits
Merge branch 'hotfix-314'
Merge branch 'master' into release/release-2-7-2014_1_5_7b