Merged in 1f0a41e95505c12af17c416651d70f18ea7c6a07, thanks!