Update with tkt #617
Update with tkt #617

tcmitchell/geni-portal,charliemeyer/geni-portal,charliemeyer/geni-portal,charliemeyer/geni-portal,charliemeyer/geni-portal,tcmitchell/geni-portal,tcmitchell/geni-portal,charliemeyer/geni-portal,tcmitchell/geni-portal,tcmitchell/geni-portal