Sync'd branch integration/b2g-inbound with upstream @ Fri Oct  3 03:18:42 PDT 2014