Sync'd branch integration/b2g-inbound with upstream @ Fri Sep 12 04:03:40 PDT 2014