Sync'd branch integration/b2g-inbound with upstream @ Sun Oct 19 01:53:48 PDT 2014