* merged changes from  master (aacb734af0150a564427ca99e422d73365adc988 from Dec 5, 2013) of official Stratosphere repository.