Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 17 03:53:48 PDT 2014