upstream/15.10.20151116

Loong Jin Chow

@hyperair

792a781d · Imported Upstream version 15.10.20151116 · Nov 28, 2015

Upstream version 15.10.20151116