Added an ignore for tmp/
Merge commit 'a26e2ac65664ae574941d13d69f12fd030d33bcc' into builders