Merge branch 'develop'
Now using appengine-fixture-loader installed from GitHub