Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 28 01:53:46 PDT 2014