Fix a bug I introduced
Resync with trunk.
Merge branch 'trivial-fixes' of https://github.com/peternewman/ola into trivial-fixes
Add a timestamp to model data filenames so they're unique
Merge pull request #383 from peternewman/trivial-fixes

Fix a bug I introduced