#6426 Add support for category property
Merge remote-tracking branch 'origin/master' into 6435/truncate_alert

Conflicts:
	apns.py
#6435 Simplify truncate function to not use uuid
#6435 Documentation