Commit a76d8b0d5531a6a8d682ea9d5150ee7893932269

blueshade7 2019-07-17T14:12:06

Merge commit '504bb17287c978d60a4a515555852465319f74ed' into var-subset