Sync'd branch integration/b2g-inbound with upstream @ Fri Oct 17 13:28:34 PDT 2014