Fixed another Django 1.5 user model bug in initial migration.
Merge branch 'dev' into f/force_variant
Order variants by primary key in order for 'force variant' to work.