Merge commit 'ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed' into kraken * commit 'ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed': Don't allow invalid Uris to be added as observers.
Merge commit 'ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed' into kraken * commit 'ee1cdd0e605e9154b3b61d4bf7dd5aad9cab88ed': Don't allow invalid Uris to be added as observers.