makefile update at Mon Nov 24 19:17:02 CST 2014
Merge remote-tracking branch 'upstream/develop' into develop
Merge remote-tracking branch 'upstream/develop' into develop
Merge pull request #18463 from tjyang/develop

"Double requirement given: six ..."