There are some useful commits that can go in master along with a small bug fix.

There are some useful commits that can go in master along with a small bug fix. Taken from your commits in MSNBC repo. Juampy suggested to have it synced with your master so we can keep it up to date instead of fixing locally.