Merge updates from zendframework repo to ugameplan fork

Pull bug fixes into the ugameplan fork