Merge updates to master into themes/holo-light branch.