Merge 3.5

This commit is contained in:
Yury Selivanov 2015-09-13 01:40:46 -04:00
commit cc32fbabe2