Prepare merge on master
Prepare merge on master

vector-im/riot-ios,vector-im/riot-ios,vector-im/vector-ios,vector-im/riot-ios,vector-im/riot-ios,vector-im/riot-ios,vector-im/riot-ios,vector-im/vector-ios,vector-im/vector-ios