Merge pull request #1 from jivesoftware/master

Changes to Main