Pulled latest updates from trunk

This commit is contained in:
Benoit Steiner
2016-01-20 13:56:43 -08:00