updates
Merge remote-tracking branch 'upstream/master'
updates
Conflicts:
	database.pyc
Merge remote-tracking branch 'upstream/master'
updates
Conflicts:
	database.pyc