fixed reference to fixtures in manifest
Merge branch 'patch-5'
Merge branch 'master' into timely