Merge remote-tracking branch 'nficano/master' into Unittests 6ab41db garg10may commited on Oct 3, 2015