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