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