Merging PRs in to a single branch...

@davidbau -- merging your commits here for final merge to master.