Sync'd branch integration/b2g-inbound with upstream @ Sun Sep  7 20:25:36 PDT 2014