Merge branch 'fix-135' of github.com:google/skylark into fix-135

Change-Id: I20ed573da70099ba7f13153f237dfd0af039fdbd