Merge version 2.6.4-2014041800 into SEBTS_26