Merge remote-tracking branch 'remotes/upstream/master' into msg_details_icon

Conflicts:
	src/org/thoughtcrime/securesms/ConversationItem.java