Sync'd branch integration/b2g-inbound with upstream @ Fri Sep 19 08:44:49 PDT 2014