Fix missing commits from 0.28

Add missing commits to master
pull/3508/head
Paulus Schoutsen 2016-09-21 08:52:30 -07:00 committed by GitHub
commit 3dea4be2cc

Diff Content Not Available