Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 21 04:34:24 PDT 2014