merge in disqus master