save div target node and work w/ that since the id changes
Merge remote-tracking branch 'upstream/master' into 1709-Deploy_on_QA

Merged with master (Mike's fix on testpage-1div.html bug)