Merge pull request #108 from dsyer/BATCH-1950

  BATCH-1950: Patch up build