Bug fix SAM-451
Bug fix SAM-451

git-svn-id: 840349cbf2a7f44860f6cfd02374235b623e9bf9@657 66ffb92e-73f9-0310-93c1-f5514f145a0a

kingmook/sakai,duke-compsci290-spring2016/sakai,hackbuteer59/sakai,Fudan-University/sakai,ouit0408/sakai,bkirschn/sakai,tl-its-umich-edu/sakai,conder/sakai,colczr/sakai,frasese/sakai,rodriguezdevera/sakai,buckett/sakai-gitflow,whumph/sakai,colczr/sakai,frasese/sakai,ouit0408/sakai,surya-janani/sakai,bzhouduke123/sakai,bzhouduke123/sakai,zqian/sakai,colczr/sakai,bzhouduke123/sakai,udayg/sakai,puramshetty/sakai,joserabal/sakai,whumph/sakai,ouit0408/sakai,zqian/sakai,conder/sakai,hackbuteer59/sakai,kwedoff1/sakai,introp-software/sakai,pushyamig/sakai,buckett/sakai-gitflow,clhedrick/sakai,wfuedu/sakai,hackbuteer59/sakai,wfuedu/sakai,frasese/sakai,introp-software/sakai,noondaysun/sakai,frasese/sakai,ouit0408/sakai,kingmook/sakai,bkirschn/sakai,bkirschn/sakai,bkirschn/sakai,liubo404/sakai,zqian/sakai,OpenCollabZA/sakai,surya-janani/sakai,whumph/sakai,ktakacs/sakai,Fudan-University/sakai,udayg/sakai,pushyamig/sakai,whumph/sakai,lorenamgUMU/sakai,bzhouduke123/sakai,surya-janani/sakai,ktakacs/sakai,bkirschn/sakai,frasese/sakai,conder/sakai,rodriguezdevera/sakai,colczr/sakai,joserabal/sakai,tl-its-umich-edu/sakai,hackbuteer59/sakai,introp-software/sakai,frasese/sakai,hackbuteer59/sakai,tl-its-umich-edu/sakai,ktakacs/sakai,willkara/sakai,rodriguezdevera/sakai,udayg/sakai,conder/sakai,bzhouduke123/sakai,pushyamig/sakai,joserabal/sakai,ktakacs/sakai,ktakacs/sakai,wfuedu/sakai,Fudan-University/sakai,whumph/sakai,zqian/sakai,bzhouduke123/sakai,willkara/sakai,introp-software/sakai,noondaysun/sakai,colczr/sakai,OpenCollabZA/sakai,pushyamig/sakai,surya-janani/sakai,rodriguezdevera/sakai,pushyamig/sakai,OpenCollabZA/sakai,ouit0408/sakai,OpenCollabZA/sakai,lorenamgUMU/sakai,colczr/sakai,OpenCollabZA/sakai,pushyamig/sakai,wfuedu/sakai,colczr/sakai,willkara/sakai,liubo404/sakai,noondaysun/sakai,noondaysun/sakai,duke-compsci290-spring2016/sakai,noondaysun/sakai,liubo404/sakai,joserabal/sakai,lorenamgUMU/sakai,duke-compsci290-spring2016/sakai,introp-software/sakai,kingmook/sakai,udayg/sakai,lorenamgUMU/sakai,udayg/sakai,lorenamgUMU/sakai,ouit0408/sakai,OpenCollabZA/sakai,puramshetty/sakai,introp-software/sakai,colczr/sakai,Fudan-University/sakai,joserabal/sakai,buckett/sakai-gitflow,pushyamig/sakai,clhedrick/sakai,frasese/sakai,bkirschn/sakai,surya-janani/sakai,bzhouduke123/sakai,rodriguezdevera/sakai,kingmook/sakai,wfuedu/sakai,duke-compsci290-spring2016/sakai,puramshetty/sakai,ouit0408/sakai,ouit0408/sakai,lorenamgUMU/sakai,zqian/sakai,noondaysun/sakai,Fudan-University/sakai,kingmook/sakai,duke-compsci290-spring2016/sakai,whumph/sakai,buckett/sakai-gitflow,duke-compsci290-spring2016/sakai,clhedrick/sakai,lorenamgUMU/sakai,tl-its-umich-edu/sakai,kwedoff1/sakai,puramshetty/sakai,bkirschn/sakai,introp-software/sakai,buckett/sakai-gitflow,tl-its-umich-edu/sakai,Fudan-University/sakai,duke-compsci290-spring2016/sakai,puramshetty/sakai,ktakacs/sakai,udayg/sakai,pushyamig/sakai,clhedrick/sakai,joserabal/sakai,buckett/sakai-gitflow,kingmook/sakai,conder/sakai,whumph/sakai,joserabal/sakai,puramshetty/sakai,kwedoff1/sakai,liubo404/sakai,whumph/sakai,bzhouduke123/sakai,wfuedu/sakai,kingmook/sakai,kwedoff1/sakai,ktakacs/sakai,buckett/sakai-gitflow,noondaysun/sakai,frasese/sakai,willkara/sakai,kwedoff1/sakai,liubo404/sakai,clhedrick/sakai,kingmook/sakai,zqian/sakai,udayg/sakai,conder/sakai,udayg/sakai,kwedoff1/sakai,clhedrick/sakai,tl-its-umich-edu/sakai,kwedoff1/sakai,wfuedu/sakai,hackbuteer59/sakai,bkirschn/sakai,zqian/sakai,willkara/sakai,liubo404/sakai,OpenCollabZA/sakai,rodriguezdevera/sakai,willkara/sakai,ktakacs/sakai,clhedrick/sakai,Fudan-University/sakai,conder/sakai,tl-its-umich-edu/sakai,rodriguezdevera/sakai,zqian/sakai,clhedrick/sakai,liubo404/sakai,joserabal/sakai,conder/sakai,surya-janani/sakai,buckett/sakai-gitflow,lorenamgUMU/sakai,surya-janani/sakai,tl-its-umich-edu/sakai,liubo404/sakai,duke-compsci290-spring2016/sakai,puramshetty/sakai,hackbuteer59/sakai,puramshetty/sakai,OpenCollabZA/sakai,willkara/sakai,willkara/sakai,kwedoff1/sakai,Fudan-University/sakai,surya-janani/sakai,noondaysun/sakai,rodriguezdevera/sakai,hackbuteer59/sakai,introp-software/sakai,wfuedu/sakai