Updated restore to include routines in backup
Merge branch 'branch_release_20140410'