Update from Macpro

Signed-off-by: Leslie Du <lesliedu@me.com>
Merge remote-tracking branch 'origin/master'