@CarlKenner
CarlKenner DON'T Merge commit 'd800b0f79868a28356b4e40cb9b2e5af43977042' into VR…
b457afd Feb 2, 2018
DON'T Merge commit 'd800b0f79868a28356b4e40cb9b2e5af43977042' into VR… 
…-Hydra

# Conflicts:
#	Source/Core/Core/ConfigManager.cpp
b457afd