Update Knowledgebase with Master

This should give Knowledgebase all of the updates of the moreActions branch