VIX 520

Branch is now in sync with sall/master. Two of us were editing the same files.