Sync'd branch integration/b2g-inbound with upstream @ Sat Oct 18 21:33:52 PDT 2014