BUG=http://crbug.com/166496
BUG=http://crbug.com/167187

Landing this for Justin Schuh:
https://codereview.appspot.com/7011048/
Review URL: https://codereview.appspot.com/7040045


Conflicts:

	src/common/version.h

git-svn-id: https://angleproject.googlecode.com/svn/branches/dx11proto@1702 736b8ea6-26fd-11df-bfd4-992fa37f6226