Merge remote-tracking branch 'first/master'

Conflicts:
	djorm_pgarray/fields.py