Pull down changes from my PR that was approved.

PR was approved, now to sync my master with aosabook:master. :+1: