Upstream updates from Panopoly

Signed-off-by: Will <sylus1984@gmail.com>
Merge pull request #889 from sylus/master

Upstream updates from Panopoly