Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 17 04:38:41 PDT 2014