Merge remote-tracking branch 'origin/master' into feature-node-traits Conflicts: circle/dashboard/forms.py circle/dashboard/urls.py circle/dashboard/views.py
