Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 30 04:33:39 PDT 2014