Sync'd branch integration/b2g-inbound with upstream @ Sat Oct 11 22:54:46 PDT 2014