forms, models, setup.py
Merge remote-tracking branch 'upstream/master'