Merge pull request #918 from nmccready/issue_904_updateInPorgress

issue 904 race condition in plural directives
Merge remote-tracking branch 'origin/master' into polygons_directive