Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 30 09:01:41 PDT 2014