commit 2f79b90af5cbd9499f012c204f5bf4bb413ae61b Merge: 07e672159ea 989a6c699fd Author: Ryan Nowak <[email protected]> Date: Thu Mar 8 15:49:01 2018 -0800 Merge branch 'rel/vs15.7' into dev