Custom merge of ShiftIt forks