Merging in changes from master to angular branch

Since the angular branch is so far ahead, we will merge in tiny incremental changes from the master in preparation for the big merge back to master.