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