release.
Merge branch 'hotfix/14.04.1396506315'
bumped version.
Merge branch 'hotfix/14.04.1396519914'