Merge branch 'CAPX-66' of github.com:Trellon/stanford_capx into CAPX-66