Merge this

See if it fixes your page build problem.  The merge button is at the very bottom.