Corrected a residual bug caused by an incorrect merge.
Corrected a residual bug caused by an incorrect merge.

pansapiens/mytardis,steveandroulakis/mytardis,iiman/mytardis,steveandroulakis/mytardis,pansapiens/mytardis,pansapiens/mytardis,pansapiens/mytardis,steveandroulakis/mytardis,iiman/mytardis,iiman/mytardis