Merge remote-tracking branch 'origin/ImperialBranch'
Merge remote-tracking branch 'transmart/master' into new-ncibi-tools