Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20150921-1' into staging