Merge remote-tracking branch 'spoutapi/master'

Signed-off-by: Chris Sanders <zidane@outlook.com>