Fix compilation without trivstring
Try to fix compilation on cygwin
Merge remote-tracking branch 'github/build-bot-master' into bleeding-edge-master
2014.12.07-20.00