Fix for seg fault on exit.
Merge branch 'master' of https://github.com/worklist/hifi
Merge pull request #1040 from ey6es/master

Fix for seg fault on exit (no need to delete this explicitly, as it's a child of the Application).