Merge branch 'hotfix/14.04.1396519914'
Ported for Ubuntu trusty.
Fixed broken tests.
Merge branch 'hotfix/14.06.1401596949'
Merge tag '14.06.1401596949' into develop

release.