Sync'd branch integration/b2g-inbound with upstream @ Fri Sep 12 08:53:41 PDT 2014