Merge commit 'a8d8cb12b3dbe5e196a3ff2549f8594a704ecde4' into kraken * commit 'a8d8cb12b3dbe5e196a3ff2549f8594a704ecde4': Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter
Merge commit 'a8d8cb12b3dbe5e196a3ff2549f8594a704ecde4' into kraken * commit 'a8d8cb12b3dbe5e196a3ff2549f8594a704ecde4': Fix for bug 2672749: StringIndexOutOfBoundsException in Uri.getQueryParameter