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