Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 10 00:53:42 PDT 2014