Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 30 08:18:40 PDT 2014