Merge 1.1 to master

@lsmith77 @dantleech can you help me here? why is this happening? this is a protected method and we seem not to call it... should be removed? or did git merge lose some changes that we need additionally?