Sync'd branch integration/b2g-inbound with upstream @ Sun Oct  5 19:53:45 PDT 2014