Added tr1/memory include for linux compilation
Merge remote-tracking branch 'origin/master'