Prevent sending cookies if SAPI is 'cli'
Merge branch '2.0' of git://github.com/ICanBoogie/ICanBoogie into 2.0