Sync'd branch integration/b2g-inbound with upstream @ Tue Oct 21 15:43:40 PDT 2014