Merge commit '629d03f12251220daf26abc5be86d4649318a331' into kraken * commit '629d03f12251220daf26abc5be86d4649318a331': Fix for bug 2548048 - it was impossible for applications to discover
Merge commit '629d03f12251220daf26abc5be86d4649318a331' into kraken * commit '629d03f12251220daf26abc5be86d4649318a331': Fix for bug 2548048 - it was impossible for applications to discover