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