Back-merge to include #1198
authorJonathan L Long <jonlong@cs.berkeley.edu>
Thu, 2 Oct 2014 18:53:55 +0000 (11:53 -0700)
committerJonathan L Long <jonlong@cs.berkeley.edu>
Thu, 2 Oct 2014 18:53:55 +0000 (11:53 -0700)
commitae3e17ea13da999588ea0c09a9cf0564efcbaffb
treeafbdaf6090351d6760faa38ce526151c6d62a111
parent22515af9a964840a1ab7082eddf27d7733a9956f
parent8da7beda30b796c58750eb3fcb38a3ba67053501
Back-merge to include #1198