Sync'd branch integration/b2g-inbound with upstream @ Sun Sep  7 09:53:39 PDT 2014