Pulled in branch master from Mozilla's popcorn maker repo