Merge branch 'priv-1.9'
authorAndrew Waterman <waterman@cs.berkeley.edu>
Tue, 15 Mar 2016 00:01:44 +0000 (17:01 -0700)
committerAndrew Waterman <waterman@cs.berkeley.edu>
Tue, 15 Mar 2016 00:01:44 +0000 (17:01 -0700)

Trivial merge