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