Merge commit '487529a70cd1479ae8d6bbfb356be7e72542c185' * commit '487529a70cd1479ae8d6bbfb356be7e72542c185': First baby steps towards settings backup
Merge commit '487529a70cd1479ae8d6bbfb356be7e72542c185' * commit '487529a70cd1479ae8d6bbfb356be7e72542c185': First baby steps towards settings backup