Really Fixed it this time
Merge remote-tracking branch 'jack/master'