Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 28 08:56:48 PDT 2014