Sync'd branch integration/b2g-inbound with upstream @ Fri Sep  5 08:59:43 PDT 2014