Merge branch 'master' into getHierarchy
fixed race condition in tests

apparently `update_attributes` does not *reliably* work for
`updated_at`, whereas `update_attribute` does work