Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 30 02:07:45 PDT 2014