Changes to run on appfog.
Merge branch 'dev'