Hot fix for 1387
Merged master on to the branch
Merge pull request #220 from ENCODE-DCC/1387_hot_fix

1387 hot fix