Sync'd branch integration/b2g-inbound with upstream @ Fri Sep  5 06:35:36 PDT 2014