Merge branch 'develop' into notices-again

diff --cc pumpio/pumpio.php
index 14ce139671bf386cc435ea15c05c7ebfac37185d,fb96d5b69bd95ee01646a814542bc3623f18e2be..c0f36c1db88de17b7d6a5089f2ec89066ec10529
--- 1/pumpio/pumpio.php
--- 2/pumpio/pumpio.php
+++ b/pumpio/pumpio.php
@@@ -1391,8 -1391,8 +1391,8 @@@ function pumpio_getallusers(App &$a, $u
                }
        }
  
 -      if (is_array($users->items)) {
 +      if (!empty($users->items)) {
-               foreach ($users->items AS $user) {
+               foreach ($users->items as $user) {
                        pumpio_get_contact($uid, $user);
                }
        }