iPhone master to setdirection master merge (post kazoo_dev release)