Gtr rebase me

maybe it's fixed now! 
#excellentcommitmessages