Merge pull request #1 from seththeriault/master

Updated for latest Sakai trunk (11+)