Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 30 06:44:43 PDT 2014