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