Sync'd branch integration/b2g-inbound with upstream @ Fri Oct  3 10:13:41 PDT 2014