Merge hotfix-2014-08-29 back to master

TNL-178