Include latest spa-json fixes in next branch
This MR includes the spa-json fixes from !515 (merged) and !516 (merged) that were merged in master.
Due to an influx of spam, we have had to impose restrictions on new accounts. Please see this wiki page for instructions on how to get full permissions. Sorry for the inconvenience.
This MR includes the spa-json fixes from !515 (merged) and !516 (merged) that were merged in master.