Merge branch 'hotfix/14.04.1396491150'
release.
Merge branch 'hotfix/14.04.1396506315'
Merge branch 'hotfix/14.04.1396506315' into develop
bumped version.
Merge branch 'hotfix/14.04.1396519914' into develop