Fix hardcoded path.
Merge remote-tracking branch 'origin/master' into krissn
Merge remote-tracking branch 'origin/master' into krissn
Merge remote-tracking branch 'origin/master' into krissn