Sync'd branch integration/b2g-inbound with upstream @ Fri Sep 12 06:31:44 PDT 2014