Sync'd branch integration/b2g-inbound with upstream @ Sun Oct 19 19:43:44 PDT 2014