Sync'd branch integration/b2g-inbound with upstream @ Fri Sep 12 07:18:36 PDT 2014