Sync'd branch integration/b2g-inbound with upstream @ Sat Oct 11 10:35:39 PDT 2014